Merge from mainline.
authorKatsumi Yamaoka <katsumi@flagship2>
Thu, 6 May 2010 12:51:40 +0000 (12:51 +0000)
committerKatsumi Yamaoka <katsumi@flagship2>
Thu, 6 May 2010 12:51:40 +0000 (12:51 +0000)

Trivial merge